From ca4ffbfe80ce035d3c76852648835b62135169d3 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Sat, 23 Jan 2016 14:24:39 -0800 Subject: [PATCH] wintab: reorganize code to avoid prototypes --- gdk/win32/gdkdevice-wintab.c | 87 +++++++++--------------------------- 1 file changed, 21 insertions(+), 66 deletions(-) diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c index 585a6f1f70..fb7f0f2d7d 100644 --- a/gdk/win32/gdkdevice-wintab.c +++ b/gdk/win32/gdkdevice-wintab.c @@ -25,74 +25,8 @@ #include "gdkwin32.h" #include "gdkdevice-wintab.h" -static gboolean gdk_device_wintab_get_history (GdkDevice *device, - GdkWindow *window, - guint32 start, - guint32 stop, - GdkTimeCoord ***events, - gint *n_events); -static void gdk_device_wintab_get_state (GdkDevice *device, - GdkWindow *window, - gdouble *axes, - GdkModifierType *mask); -static void gdk_device_wintab_set_window_cursor (GdkDevice *device, - GdkWindow *window, - GdkCursor *cursor); -static void gdk_device_wintab_warp (GdkDevice *device, - GdkScreen *screen, - gdouble x, - gdouble y); -static void gdk_device_wintab_query_state (GdkDevice *device, - GdkWindow *window, - GdkWindow **root_window, - GdkWindow **child_window, - gdouble *root_x, - gdouble *root_y, - gdouble *win_x, - gdouble *win_y, - GdkModifierType *mask); -static GdkGrabStatus gdk_device_wintab_grab (GdkDevice *device, - GdkWindow *window, - gboolean owner_events, - GdkEventMask event_mask, - GdkWindow *confine_to, - GdkCursor *cursor, - guint32 time_); -static void gdk_device_wintab_ungrab (GdkDevice *device, - guint32 time_); -static GdkWindow * gdk_device_wintab_window_at_position (GdkDevice *device, - gdouble *win_x, - gdouble *win_y, - GdkModifierType *mask, - gboolean get_toplevel); -static void gdk_device_wintab_select_window_events (GdkDevice *device, - GdkWindow *window, - GdkEventMask event_mask); - - G_DEFINE_TYPE (GdkDeviceWintab, gdk_device_wintab, GDK_TYPE_DEVICE) -static void -gdk_device_wintab_class_init (GdkDeviceWintabClass *klass) -{ - GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass); - - device_class->get_history = gdk_device_wintab_get_history; - device_class->get_state = gdk_device_wintab_get_state; - device_class->set_window_cursor = gdk_device_wintab_set_window_cursor; - device_class->warp = gdk_device_wintab_warp; - device_class->query_state = gdk_device_wintab_query_state; - device_class->grab = gdk_device_wintab_grab; - device_class->ungrab = gdk_device_wintab_ungrab; - device_class->window_at_position = gdk_device_wintab_window_at_position; - device_class->select_window_events = gdk_device_wintab_select_window_events; -} - -static void -gdk_device_wintab_init (GdkDeviceWintab *device_wintab) -{ -} - static gboolean gdk_device_wintab_get_history (GdkDevice *device, GdkWindow *window, @@ -335,3 +269,24 @@ _gdk_device_wintab_translate_axes (GdkDeviceWintab *device_wintab, if (y) *y = temp_y; } + +static void +gdk_device_wintab_class_init (GdkDeviceWintabClass *klass) +{ + GdkDeviceClass *device_class = GDK_DEVICE_CLASS (klass); + + device_class->get_history = gdk_device_wintab_get_history; + device_class->get_state = gdk_device_wintab_get_state; + device_class->set_window_cursor = gdk_device_wintab_set_window_cursor; + device_class->warp = gdk_device_wintab_warp; + device_class->query_state = gdk_device_wintab_query_state; + device_class->grab = gdk_device_wintab_grab; + device_class->ungrab = gdk_device_wintab_ungrab; + device_class->window_at_position = gdk_device_wintab_window_at_position; + device_class->select_window_events = gdk_device_wintab_select_window_events; +} + +static void +gdk_device_wintab_init (GdkDeviceWintab *device_wintab) +{ +} -- 2.30.2